cleaned up application layout