finish app layout
merge conflict resolved: fongs refactoring