updated layout to cope with new navigation classes