A little restructuring of the front-end components...