Minor clean-up to App Layout