Bunch of random fixes.
Css Fixes, position fixes
Merged with master