App Cleanup
Layout Update