More fixes
Bug fixes and visual tweaks