WIP: Reorganizing the front end widgets