Significant refactoring

Adding two new controls, changing the scope of the first page