fix for CSRF enabled issue and rearranging items