Cleanup of worklets and more messing around with the layout