Improved ui and ux