Controllers are widgets, fixed formatting

Things are laying out a little more nicely now. I changed the controllers to be widgets since we don't want the view to be doing any calculating. Example in-line.