buttons fix & adding forms