Improved the view, added icons.