Fixed some layout oversights