Update UI and cleaned up code in ARKS