cleaned up application layout
cleaned up variables