Some changes to the Layout of the code