Componentize spacing and corners

Well, there is nothing to stop you :wink: