some fine layout form fixing