Schedule view tidied up