Should be working 

Think i have fixed the major problems