fixed frontend + admin button
Merge remote-tracking branch 'upstream/master'