added icons and tweeks