App Setup And Layout Fixes