completed UI and improved styles