Code cleanup, css improvements