Rework done
BackButton and Logout Button added