Proper markup

reuploading with proper markup, will take care of the text later.