Added app window and continued updating layout