new beer admin template handling and small bugfix