JB: Cleaned UI