Added structuring and basic button