Add missing buttons, separate forms logic