More work into stuff tab