Cleanup
Change UI look an feel