Rearranging some things by features
Adding to .css file
Adding unit tests