Added more layout to Main (Alpha 1.3)