Fixed layout.  Better logic in controller