Added todos and layout