Cell UI Improvements