The Sunday: Important Update/Small Bug Fixed

I listened to community opinion and did few changes/improvements.