First stab at making the settings a popup
Finished tweaking the settings