clean + work on ui