Close #30 New app layout