Enhanced Big List view + Fixes