Cleaned up some layout