Fixed some layout stuff... Still need to REFACTOR!