#2143 Moved buttons, added descriptions.