Profile stuff
Merged changes in css