Made the last few changes to drawing functions
Missed these on the last commit
File Renaming and added base for app gui