layout changes, added icons, other updates