Added tags showing and "Next" button