Added a few controls
using current_screen instead of ids