Added metadat fields and reworked settings form