More Layout and Controller Additions