Final Version - all UI updates implemented