Fixed some bugs and added more layout stuff for chores