Styling update
#8 Styling improvments