Added scene controls + bugfix