:bug: improvments on last tab