fixed a couple of bugs and made organisation pages better