Added scheduler layour + fixed navtabs