Added changes from branch common(navigation,labels)
Added static plans version