Removed hardcoded searchbox and contact menu and switched to using Drupals own logic - some theming still missing