styling and functional changes made