Beganin organizing / cleaning up application layout