changes to style
more styling and modals
buttons
merge with development