- T236: Changed handling and gave currently used buttons proper names