more fixes
Various Styling