Fixed alias bug and removed HTML button
Merge remote-tracking branch 'origin/master'