Cleaning up some layout markup