Clara

Mergin old GUI with new GUI