Add close btn to schedule view
Also some Ui improvemtnts for schedule