Tweaked CSS and code wip