More changes to the new design
Moving modal templates into separate files
Now using angularui to handle bootstrap modals