gimmick buttons; layout and translation improvements
merged master