trying to fix forms layout validation
fixing some modal elements, pop / follow changes