Clean code
Add styling and more functionality