rearrange files + fixing padding and button