Corrected id names for layout elements.
Added todo items