form bugs + layout tweaks