Changed css and templates a little