Add styles and restructure code