bugfix: display a proper message depending on the action
remove some more set e and x because this is done by bootstrap now