Improved UI, added buttons and features