fix loading
icons
cleanup