merge-stuff
Added check for whether organisation is chosen and some styling
Reset serverurl and added organisation-styling