added appliction layout, reduced redundancy