Finished full screen and markup stuff
Fixed merge conflict
Added titles and tols
Merge pull request #21 from ahomatthew/projects/enova

Projects/enova