Layout tune & menu links fix