Fix random bugs and cleanup layout.

Fixed random bugs that were still left over form the transition from
laravel3.  Made changes to the layout so that it looks more consistent.