Moved functionality from exp List into adapter