+ added new layout
+ fixed bugs in admin page