Improve styles and start on build system