Moved form in demo + fixes