Misc fixes
Better theme