Tidy up / simplify tab window