Moving navigation buttons to navbar