Updated the some layout stuff