Cleanup, add styles, some content