Lots of updates for css and logic etc...