#1 Improve styles