Refactored and styled Organisations and contacts