Add some css styles and improved the experience