Finished initial markup of basic widgets