Added extra feature and css modifications