Added modals. Seperated some components.