Added Edit button and realigned forms/buttons