improved UI for better looking