Redesign

:+1 to the bottom part here, this works as expected.