Removed unnecessary layout
Reordered some lines in the Main constructor