Added todos and icons