Tidied up cable positions.
Re-positioned battery pack and power switch.