improve layout, remove old buttons, improve english and clean up code