Bug Fix + UI Improvements