some restyling, added buttons, etc;