Fixing #3 and #4 . Cosmetic on css