Cleanerd up layout xmls and addede necessary ones for navigation bar