UI layout update

Made a topbar, fixed week numbers calculation bug.