Few Tweaks

Moved a few bits and bobs - trying to find the source of the error