Added hardcoded functions for showing/hiding the amount popup and removed some useless code.
Manual merge.