Collapsible List Fix

Fixed the collapsible list issue. Fine tunning design left.