added form, adjusted width, padding and margin