Tons of cleanup. Much cleaner now. Start introducing horizontal layouts