Merged in SmartStart layout