Improved the navbar control layout