Cleaned up in preperation for release
Added icons