Image upload now works as expected, also cleaned up code for basic/advanced toggle
Optimisations for get scope method