Add more styles and fixes