Modify few bugs of inbox