refactoring css and feature.erb file tokeep consistent with styling.
fixing merge conflicts