Improved look and added icons to value section