improved the style and added better click actions