Layout initialization moved to a separate class