Form and visual fixes