lots of cleanup and icons etc. much prettier and smoother