Improve Main UI.
Tried out scheduler