Add styles and refactor desing