added initial items loading, icons, cleaned up things