Cleanup
Adding controls