Fixed the modals.. I don't like these at all