Fix layout of metadata. Add nullpointer check for xpath on metadata. Add new icons