TW-17: Cleans up the navbar