Updated layouts and changed loading method.