Lots of Stuff Done

Finished Up a bunch of modals and fixed some things due to how includes
can be used.