Some tweaks and a WORKING switch button ;)