Slight Tweaks

Combined different windows into one app

Converted app into classes