design same part + some fixes + tabs switch