Changed Overlay and Outline

Code was drastically changed to be organized and for future code.