More updates regarding styling and states