Moved lists to the right place