Fixed a scrolling issue and added some layout stuff