Layout and Mark Completed added