added cacheing, tweaked icon and layout