Added Click Rules
Cleaned up the UI elements not currently being used