#12 #13 fixed top Right bar issue and change menu text to plain text