Cleaned up user controls and added Matt Leeke functionality