Main layout adjustments
Main layout adjustments, smart navigation links