@ninas the javascript stuff will take me a while to do as I don't understand js that well i.e. need to do some reading on it, is it possible to merge the current changes then I can work on it later?