Modified a few elements to customise theme as per my preferences