Added form and re-sized various elements