Clean up + updates
Styles and etc