Implemented duration and fixed navbar spacing logic