front-end admin and some other

change and fixes to have same functionality in Frend-end admin as in
Back-end