Change pass text/action bar fix
small code/xml refactoring