Refine UI and remove unused features