Make all forms uniform, fix logout issue