button updated + restructured