Improvements in ui buttons, full functionality up