Fixed Carpalx layouts, cleanup