updated for handling media
added labels to forms