Changes to the Admin screens

The admin screens now flow better. Most of the column cleanups
are there too. The idea is to move between different models
where it makes sense.