TabSheet refact and some fix