Initial CSS, some JS improvements
Merge extra changes