Bug #1 Fix + Merged  UI