Updated styling and functionality