clean up application layout
added spork and guard