changing app settings
merged conflicts
tweaking markup and settings