fixing styling
trying to implement modals
merged
stuff