few changes for better fragment-transaction