Remove unused function
Add Frame control
Add Image control