Branch: development_settings
Design changes and other changes