refactored the design, making it more cohesive. Also I added some functionality in to modals for better flow