Changed styles and added more functionality